xend: Fix c/s 20137 -- do not redefine built-in name 'str'.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py
index f5c9bdac94ed42f9ae842ab2a10a15bef953995b..32496041d165803b7159737807bfd16c55782d6a 100644 (file)
--- a/tools/python/xen/xend/XendDomainInfo.py
+++ b/tools/python/xen/xend/XendDomainInfo.py
@@ -2411,10 +2411,10 @@ class XendDomainInfo:
             log.exception(e)
 
         if not self.domid or self.domid < 0:
-            str = 'Creating domain failed: name=%s' % self.info['name_label']
+            failmsg = 'Creating domain failed: name=%s' % self.info['name_label']
             if self.domid:
-                str += ', error=%i' % int(self.domid)
-            raise VmError(str)
+                failmsg += ', error=%i' % int(self.domid)
+            raise VmError(failmsg)
 
         self.dompath = GetDomainPath(self.domid)